From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 23 Sep 2015 18:00:23 +0000 (+0200)
Subject: theme-node: Rewrite switch statement
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1200
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c3a29d6df153667b8ded2302e4342f56e538d337;p=gnome-shell.git

theme-node: Rewrite switch statement

Some compilers warn about unhandled enum values in switch statements,
so don't use one where only two out of 21 possible values make sense.
---

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 4c8fabd40..c109baeb1 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -840,26 +840,21 @@ st_theme_node_lookup_time (StThemeNode *node,
       if (strcmp (decl->property->stryng->str, property_name) == 0)
         {
           CRTerm *term = decl->value;
+          int factor = 1;
 
           if (term->type != TERM_NUMBER)
             continue;
 
-          switch (term->content.num->type)
-            {
-            case NUM_TIME_S:
-              *value = 1000 * term->content.num->val;
-              result = TRUE;
-              break;
-            case NUM_TIME_MS:
-              *value = term->content.num->val;
-              result = TRUE;
-              break;
-            default:
-              ;
-            }
+          if (term->content.num->type != NUM_TIME_S ||
+              term->content.num->type != NUM_TIME_MS)
+            continue;
 
-          if (result)
-            break;
+          if (term->content.num->type == NUM_TIME_S)
+            factor = 1000;
+
+          *value = factor * term->content.num->val;
+          result = TRUE;
+          break;
         }
     }